applications/siitwizard:

	- fixup olsrd txtinfo accept parameter
	- use network-, not host-ip for gateway-side siit ipv4 route

diff --git a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
index dbaaa17acc5609d91419f746673df6460544fdda..de4fab001bcd2c6b8931802f4348f3ef31f7b657 100644 (file)
--- a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -169,7 +169,7 @@ function mode.write(self, section, value)
 
                uci:section("network", "route", nil, {
                        interface = "siit0",
-                       target    = gv4_net:host():string(),
+                       target    = gv4_net:network():string(),
                        netmask   = gv4_net:mask():string()
                })
 
@@ -314,6 +314,14 @@ function mode.write(self, section, value)
                prefix  = siit_route:prefix()
        })
 
+       -- txtinfo v6
+       uci:foreach("olsrd", "LoadPlugin",
+               function(s)
+                       if s.library == "olsrd_txtinfo.so.0.1" then
+                               uci:set("olsrd", s['.name'], "accept", "::1")
+                       end
+               end)
+
        uci:save("wireless")
        uci:save("firewall")
        uci:save("network")